bitkeeper revision 1.1159.1.328 (41868fc0ltqwD-JwEuH-hRskylY8aw)

Be consistent about naming includes: asm/xen-public -> asm-xen/xen-public

diff --git a/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h
index d16895d2c26c20be606ce2c1b04f27d45f1dbe5e..122fef8247094222d7079c583a44da7b80df8c45 100644 (file)
--- a/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h
+++ b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h
@@ -18,11 +18,11 @@
 #include <linux/hdreg.h>
 #include <linux/blkdev.h>
 #include <linux/major.h>
-#include <asm/xen-public/xen.h>
+#include <asm-xen/xen-public/xen.h>
 #include <asm/io.h>
 #include <asm/atomic.h>
 #include <asm/uaccess.h>
-#include <asm/xen-public/io/blkif.h>
+#include <asm-xen/xen-public/io/blkif.h>
 
 #if 0
 #define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a )

diff --git a/linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c
index b77703ac89a131cecc62ba55015e3a4651830a84..17e027ff19396cc9ded0255fdfa1b079a2a2e9a4 100644 (file)
--- a/linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c
+++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c
@@ -18,8 +18,8 @@
 #include <asm/segment.h>
 #include <asm/io.h>
 
-#include <asm/xen-public/xen.h>
-#include <asm/xen-public/physdev.h>
+#include <asm-xen/xen-public/xen.h>
+#include <asm-xen/xen-public/physdev.h>
 
 #include "pci-i386.h"
 

diff --git a/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c
index 806e9a73f611e133e180501639d1c347591d2dec..4e81bfe877d5d99e6739f3ab488d7c75cb3564ad 100644 (file)
--- a/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c
+++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c
@@ -44,7 +44,7 @@
 #include <asm/desc.h>
 #include <asm/mmu_context.h>
 #include <asm/multicall.h>
-#include <asm/xen-public/dom0_ops.h>
+#include <asm-xen/xen-public/dom0_ops.h>
 
 #include <linux/irq.h>
 

diff --git a/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c
index 92312734b8d6f0b60c465d700d6a40be4745d064..72454469d0a2d5e84e19dce58e3ac899caec44ce 100644 (file)
--- a/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c
+++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c
@@ -48,7 +48,7 @@ static int errno;
 #include <asm/mmu_context.h>
 #include <asm/ctrl_if.h>
 #include <asm/hypervisor.h>
-#include <asm/xen-public/dom0_ops.h>
+#include <asm-xen/xen-public/dom0_ops.h>
 #include <linux/netdevice.h>
 #include <linux/rtnetlink.h>
 #include <linux/tqueue.h>
@@ -335,7 +335,8 @@ void __init setup_arch(char **cmdline_p)
      * and the bootmem bitmap. 
      * NB. There is definitely enough room for the bootmem bitmap in the
      * bootstrap page table. We are guaranteed to get >=512kB unused 'padding'
-     * for our own use after all bootstrap elements (see asm/xen-public/xen.h).
+     * for our own use after all bootstrap elements 
+     * (see asm-xen/xen-public/xen.h).
      */
     boot_pfn = min((int)xen_start_info.nr_pages,lmax_low_pfn);
     bootmap_size = init_bootmem(start_pfn,boot_pfn);

diff --git a/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c
index d4b6f5edac7077c3ad286916236746723be18cc9..0a04c6c3b62a5961e7e8266d999d529cb176f970 100644 (file)
--- a/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c
+++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c
@@ -52,7 +52,7 @@
 
 #include <asm/div64.h>
 #include <asm/hypervisor.h>
-#include <asm/xen-public/dom0_ops.h>
+#include <asm-xen/xen-public/dom0_ops.h>
 
 #include <linux/mc146818rtc.h>
 #include <linux/kernel.h>

diff --git a/linux-2.4.27-xen-sparse/include/asm-xen/page.h b/linux-2.4.27-xen-sparse/include/asm-xen/page.h
index 239daa6ede73b8e3635edd5603f76e19a759dba4..546cb65b2213f76d0fb3481137bb550baade5a49 100644 (file)
--- a/linux-2.4.27-xen-sparse/include/asm-xen/page.h
+++ b/linux-2.4.27-xen-sparse/include/asm-xen/page.h
@@ -12,7 +12,7 @@
 #include <linux/config.h>
 #include <linux/string.h>
 #include <asm/types.h>
-#include <asm/xen-public/xen.h>
+#include <asm-xen/xen-public/xen.h>
 
 #ifdef CONFIG_XEN_SCRUB_PAGES
 #define scrub_pages(_p,_n) memset((void *)(_p), 0, (_n) << PAGE_SHIFT)

diff --git a/linux-2.4.27-xen-sparse/include/asm-xen/segment.h b/linux-2.4.27-xen-sparse/include/asm-xen/segment.h
index 276765d1de76799c8c7970918fa847499ff5a793..5b3a4392f38dab9720568047d768218ad709d39e 100644 (file)
--- a/linux-2.4.27-xen-sparse/include/asm-xen/segment.h
+++ b/linux-2.4.27-xen-sparse/include/asm-xen/segment.h
@@ -4,7 +4,7 @@
 #ifndef __ASSEMBLY__
 #include <linux/types.h>
 #endif
-#include <asm/xen-public/xen.h>
+#include <asm-xen/xen-public/xen.h>
 
 #define __KERNEL_CS    FLAT_RING1_CS
 #define __KERNEL_DS    FLAT_RING1_DS

diff --git a/linux-2.6.9-xen-sparse/arch/xen/Makefile b/linux-2.6.9-xen-sparse/arch/xen/Makefile
index 1185a454fc06786e994a17fafcd3e9932c951238..a0d11b2e228edea0d93f457c15e0b2c3c8647a9e 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/Makefile
+++ b/linux-2.6.9-xen-sparse/arch/xen/Makefile
@@ -33,16 +33,11 @@ include/asm-xen/asm:
        @echo '  SYMLINK $@ -> include/asm-xen/asm-$(XENARCH)'
        @ln -fsn asm-$(XENARCH) $@
 
-include/asm-xen/asm-$(XENARCH)/xen-public:
-       @echo '  SYMLINK $@ -> include/asm-xen/xen-public'
-       @ln -fsn ../xen-public $@
-
 arch/xen/arch:
        @rm -f $@
        @ln -fsn $(XENARCH) $@
 
 prepare: include/.asm-ignore include/asm-xen/asm \
-       include/asm-xen/asm-$(XENARCH)/xen-public \
        arch/xen/arch ;
 
 all: vmlinuz

diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
index e6978360e880cf1f00f378c89268d65501009e7f..cc71364989074b38c416d03e40b36c97649bcab1 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S
@@ -48,7 +48,7 @@
 #include <asm/smp.h>
 #include <asm/page.h>
 #include "irq_vectors.h"
-#include <asm/xen-public/xen.h>
+#include <asm-xen/xen-public/xen.h>
 
 #define nr_syscalls ((syscall_table_size)/4)
 

diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/head.S b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/head.S
index b773a18e5e13d902e25472fd648511959bcfaa04..1259369c03c28f10b47924275e317fbf3d261505 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/head.S
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/head.S
@@ -15,7 +15,7 @@
 #include <asm/segment.h>
 #include <asm/thread_info.h>
 #include <asm/asm_offsets.h>
-#include <asm/xen-public/arch-x86_32.h>
+#include <asm-xen/xen-public/arch-x86_32.h>
 
 /*
  * References to members of the new_cpu_data structure.

diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/ioport.c b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/ioport.c
index 3c85bee294511f2765b644830f89c48d9f4edf12..4cae7675aeb4a26f4a47824071c67f8ccf662b65 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/ioport.c
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/ioport.c
@@ -8,7 +8,7 @@
 #include <linux/smp_lock.h>
 #include <linux/stddef.h>
 #include <linux/slab.h>
-#include <asm/xen-public/dom0_ops.h>
+#include <asm-xen/xen-public/dom0_ops.h>
 
 asmlinkage long sys_iopl(unsigned int new_io_pl)
 {

diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/process.c b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/process.c
index 66d9d6e4d0e8e2cf13cd31923ad5a02e83942c37..a278f8aa39c2b581deb7619a18fc19985e027826 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/process.c
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/process.c
@@ -47,7 +47,7 @@
 #include <asm/irq.h>
 #include <asm/desc.h>
 #include <asm-xen/multicall.h>
-#include <asm/xen-public/dom0_ops.h>
+#include <asm-xen/xen-public/dom0_ops.h>
 #ifdef CONFIG_MATH_EMULATION
 #include <asm/math_emu.h>
 #endif

diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/pci/direct.c b/linux-2.6.9-xen-sparse/arch/xen/i386/pci/direct.c
index e964ae00f1d87211344888911811d851f52950a4..de51b01855e807b0c1dd5eba9e5898571f769214 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/pci/direct.c
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/pci/direct.c
@@ -6,8 +6,8 @@
 #include <linux/init.h>
 #include "pci.h"
 
-#include <asm/xen-public/xen.h>
-#include <asm/xen-public/physdev.h>
+#include <asm-xen/xen-public/xen.h>
+#include <asm-xen/xen-public/physdev.h>
 
 /*
  * Functions for accessing PCI configuration space with type xen accesses

diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c b/linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c
index b7761350a9a9e918ee7058225779c515902eb6b1..aef1adf12e9ef0e361d4ccaf73add1a7e0d42e5d 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c
@@ -19,8 +19,8 @@
 
 #include "pci.h"
 
-#include <asm/xen-public/xen.h>
-#include <asm/xen-public/physdev.h>
+#include <asm-xen/xen-public/xen.h>
+#include <asm-xen/xen-public/physdev.h>
 
 /*
  * Never use: 0, 1, 2 (timer, keyboard, and cascade)

diff --git a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c
index 37ba61846af9d045a3ce81bc3d28972f193819fe..28dca535d9983141ebf99350a00ef5880f54f63c 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c
+++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c
@@ -38,8 +38,8 @@
 #include <asm/system.h>
 #include <asm/ptrace.h>
 #include <asm/synch_bitops.h>
-#include <asm/xen-public/event_channel.h>
-#include <asm/xen-public/physdev.h>
+#include <asm-xen/xen-public/event_channel.h>
+#include <asm-xen/xen-public/physdev.h>
 #include <asm-xen/ctrl_if.h>
 #include <asm-xen/hypervisor.h>
 

diff --git a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h
index 8503cfedcc3aae2a9f67a8ca7fbc80a9d8140864..ace010e0fb2b3ce6f7d3ed9f578990aac33ae039 100644 (file)
--- a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h
+++ b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h
@@ -44,7 +44,7 @@
 #include <linux/blkdev.h>
 #include <linux/major.h>
 #include <linux/devfs_fs_kernel.h>
-#include <asm/xen-public/xen.h>
+#include <asm-xen/xen-public/xen.h>
 #include <asm-xen/xen-public/io/blkif.h>
 #include <asm/io.h>
 #include <asm/atomic.h>

diff --git a/linux-2.6.9-xen-sparse/drivers/xen/console/console.c b/linux-2.6.9-xen-sparse/drivers/xen/console/console.c
index f2da97e1f409d389cd1719764e7cf738aee8f924..b293961363e10da2e8b0bd1835389deaab4d81b0 100644 (file)
--- a/linux-2.6.9-xen-sparse/drivers/xen/console/console.c
+++ b/linux-2.6.9-xen-sparse/drivers/xen/console/console.c
@@ -47,7 +47,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
-#include <asm/xen-public/event_channel.h>
+#include <asm-xen/xen-public/event_channel.h>
 #include <asm-xen/hypervisor.h>
 #include <asm-xen/evtchn.h>
 #include <asm-xen/ctrl_if.h>

diff --git a/linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c b/linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c
index 62994ba30248b7b8af17be8fabde3309cfe7c636..4a3d26d61b74d51ad65fda9e959a38abdfd232d2 100644 (file)
--- a/linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c
+++ b/linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c
@@ -26,7 +26,7 @@
 #include <asm/uaccess.h>
 #include <asm/tlb.h>
 #include <asm-xen/proc_cmd.h>
-#include <asm/xen-public/dom0_ops.h>
+#include <asm-xen/xen-public/dom0_ops.h>
 #include <asm-xen/xen_proc.h>
 
 static struct proc_dir_entry *privcmd_intf;

diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/page.h b/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/page.h
index e2604817b62edefa9400e71fc1447b5411b8dacb..f8ddd5a8c5ae81b977d3be26ef6c166c5af907c8 100644 (file)
--- a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/page.h
+++ b/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/page.h
@@ -15,7 +15,7 @@
 #include <linux/config.h>
 #include <linux/string.h>
 #include <linux/types.h>
-#include <asm/xen-public/xen.h>
+#include <asm-xen/xen-public/xen.h>
 
 #ifdef CONFIG_XEN_SCRUB_PAGES
 #define scrub_pages(_p,_n) memset((void *)(_p), 0, (_n) << PAGE_SHIFT)

diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h b/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h
index ace8984b087cde496aa6dce24bb541592045f8a6..bf2732126327320b803ae8a2ef4deb5e6211e312 100644 (file)
--- a/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h
+++ b/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h
@@ -35,7 +35,7 @@
 #include <asm-xen/hypervisor.h>
 #include <asm/ptrace.h>
 #include <asm/synch_bitops.h>
-#include <asm/xen-public/event_channel.h>
+#include <asm-xen/xen-public/event_channel.h>
 
 /*
  * LOW-LEVEL DEFINITIONS

diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h b/linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h
index f3536bf38df44777f495b20530b39aa7fbc23116..caca29bd864c4b0bf2a23420faeb58fe5c9f8df6 100644 (file)
--- a/linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h
+++ b/linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h
@@ -33,9 +33,9 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/version.h>
-#include <asm/xen-public/xen.h>
-#include <asm/xen-public/dom0_ops.h>
-#include <asm/xen-public/io/domain_controller.h>
+#include <asm-xen/xen-public/xen.h>
+#include <asm-xen/xen-public/dom0_ops.h>
+#include <asm-xen/xen-public/io/domain_controller.h>
 #include <asm/ptrace.h>
 #include <asm/page.h>